Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Feb 2012 06:41:40 +0000 (22:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Feb 2012 06:41:40 +0000 (22:41 -0800)
commit5c7a30e916e1a00300bc9a8af6e6b457f28a9597
treeb935aee8a16d1a3efb2e2e9c2cdbf141749785a5
parentf3b061511c191a6a40b7f0466702c850dec8f5f6
parent69df45ea4824cf1d35e49cf6d2298a4a1d6ef74e
Merge from trunk.
17 files changed:
src/ChangeLog
src/buffer.c
src/eval.c
src/fileio.c
src/gnutls.c
src/gtkutil.c
src/image.c
src/keyboard.c
src/keymap.c
src/lisp.h
src/nsselect.m
src/syntax.c
src/window.c
src/xdisp.c
src/xfns.c
src/xselect.c
src/xterm.c